Update the patch again
authorGert Wollny <gewo@debian.org>
Sat, 19 Jan 2019 09:25:15 +0000 (10:25 +0100)
committerGert Wollny <gewo@debian.org>
Sat, 19 Jan 2019 09:25:15 +0000 (10:25 +0100)
debian/patches/03_datadic_install.patch

index f550c8857961438ce509a2b32b8c467c3e98e84c..9d1ee1002d18fab446416636731d6064e1cec5b7 100644 (file)
@@ -26,11 +26,11 @@ Author: Mathieu Malaterre <malat@debian.org>
    # Set dictionary path to the data dir inside install main dir (prefix)
    if(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
 -    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\dicom.dic")
-+    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\dicom.dic")
++    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dicom.dic")
      # If private dictionary should be utilized, add it to default dictionary path.
      if(ENABLE_PRIVATE_TAGS)
 -      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\private.dic")
-+      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\private.dic")
++      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\private.dic")
      endif()
       # Again, for Windows strip all / from path and replace it with \\.
      string(REGEX REPLACE "/" "\\\\\\\\" DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}")
@@ -39,11 +39,11 @@ Author: Mathieu Malaterre <malat@debian.org>
    # Set dictionary path to the data dir inside install main dir (prefix).
    if(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
 -    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/dicom.dic")
-+    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/dicom.dic")
++    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dicom.dic")
      # If private dictionary should be utilized, add it to default dictionary path.
      if(ENABLE_PRIVATE_TAGS)
 -      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/private.dic")
-+      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/private.dic")
++      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/private.dic")
      endif()
    else()
      set(DCM_DICT_DEFAULT_PATH "")